build Introjucer as part of libbuilder

this makes it somewhat easier to pass in hardening flags.

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index 1bfce9ec14594ccee62c62b03a636bc9a5bfc0b1..a3b4ab945ac29495c123e5e17ec032b2381f1940 100644 (file)
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -7,6 +7,7 @@ SONAME=0.0.0
 SHORTSONAME=0
 TARGET := libjuce.so
 
+
 # (this disables dependency generation if multiple architectures are set)
 DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
 
@@ -15,6 +16,7 @@ empty=
 JUCE_PATH=../..
 MODULES_PATH=$(JUCE_PATH)/modules
 DEMO_PATH       = $(JUCE_PATH)/examples/Demo/Builds/Linux/
+INTROJUCER_PATH = $(JUCE_PATH)/extras/Introjucer/Builds/Linux/
 
 SOURCES=juce_audio_basics.cpp \
        juce_audio_devices.cpp \
@@ -103,7 +105,9 @@ JUCE_LDFLAGS += \
 
 OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
 
-.PHONY: clean install install-lib install-headers install-pkgconfig test
+.PHONY: all clean install install-lib install-headers install-pkgconfig test introjucer
+
+all: $(OUTDIR)/$(TARGET) introjucer
 
 $(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
        @echo Linking juce_dll
@@ -119,6 +123,7 @@ clean:
        rm -rf build
        rm -rf juce.pc
        make -C $(DEMO_PATH) clean
+       make -C $(INTROJUCER_PATH) clean
 
 install-lib: $(OUTDIR)/$(TARGET)
        @echo Installing juce_dll
@@ -143,6 +148,9 @@ install: install-headers install-lib install-pkgconfig
 test:
        make -C $(DEMO_PATH)
 
+introjucer: $(OUTDIR)/$(TARGET)
+       make -C $(INTROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS) $(JUCELIBS_CPPFLAGS)" CFLAGS="$(CFLAGS) $(JUCELIBS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(JUCELIBS_LIBS)"
+
 juce.pc: juce.pc.in
        sed \
                -e 's|@prefix@|$(prefix)|g' \

diff --git a/debian/rules b/debian/rules
index 913d8129eaa39d0a961f7602ca41f626bd21992b..10a4d441c4a655e2ea64bfe3a6bbd739bd848e99 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,7 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr li
 build/libjuce-doc::
        cd doxygen && doxygen Doxyfile
 
-build/libjuce-utils::
-       make -C extras/Introjucer/Builds/Linux/ Release
-
 clean::
        rm -rf doxygen/doc
+       rm -rf extras/Introjucer/Builds/Linux/build